From 1ec375ae54494d75d3f356271e8a897c53d5481e Mon Sep 17 00:00:00 2001
From: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Date: Wed, 20 Jan 2021 09:51:45 -0700
Subject: [PATCH] catch cmake up (#666)

with recent changes to *.pro files, and
some lost changes to get windows rc files working.
---
 CMakeLists.txt     | 6 +++---
 gui/CMakeLists.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2b2ec2c6c..66dd328f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,12 +227,12 @@ if(WIN32)
   set(HEADERS ${HEADERS} gbser_win.h)
   set(JEEPS ${JEEPS} jeeps/gpsusbwin.cc)
   set(LIBS ${LIBS} setupapi)
-  set(RC_FILE win32/gpsbabel.rc)
+  set(RESOURCES ${RESOURCES} win32/gpsbabel.rc)
 endif()
 
 if(MSVC)
   add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
-  add_compile_options(/MP -wd4100)
+  add_compile_options(/MP -wd4100 -wd4267)
 endif()
 
 if (UNIX AND NOT APPLE)
@@ -267,7 +267,7 @@ if (APPLE)
 endif()
 
 set(SOURCES
-  ${SOURCES} ${ALL_FMTS} ${FILTERS} ${SUPPORT} ${SHAPE} ${ZLIB} ${JEEPS}
+  ${SOURCES} ${ALL_FMTS} ${FILTERS} ${SUPPORT} ${SHAPE} ${ZLIB} ${JEEPS} ${RESOURCES}
 )
 
 # We don't care about stripping things out of the build.  Full monty, baby.
diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt
index 6f62f7ece..fd91b82f2 100644
--- a/gui/CMakeLists.txt
+++ b/gui/CMakeLists.txt
@@ -65,7 +65,7 @@ endif()
 set(RESOURCES app.qrc)
 
 if (WIN32)
-  set(RC_FILE app.rc)
+  set(RESOURCES ${RESOURCES} app.rc)
 endif()
 
 if (UNIX AND NOT APPLE)
-- 
2.30.2